Made the DB profiler use startAtomic()
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 17 Sep 2014 00:20:23 +0000 (17:20 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Wed, 17 Sep 2014 00:20:23 +0000 (17:20 -0700)
Change-Id: I6eadd071c16781b320d0c8c518e6184a4c38d874

includes/profiler/ProfilerSimpleDB.php

index 38a6436..7ef0ad0 100644 (file)
@@ -58,7 +58,7 @@ class ProfilerSimpleDB extends ProfilerStandard {
                        $dbw = wfGetDB( DB_MASTER );
                        $useTrx = ( $dbw->getType() === 'sqlite' ); // much faster
                        if ( $useTrx ) {
-                               $dbw->begin();
+                               $dbw->startAtomic( __METHOD__ );
                        }
                        foreach ( $this->mCollated as $name => $data ) {
                                $eventCount = $data['count'];
@@ -103,7 +103,7 @@ class ProfilerSimpleDB extends ProfilerStandard {
                                //     "pf_time=pf_time + VALUES(pf_time)";
                        }
                        if ( $useTrx ) {
-                               $dbw->commit();
+                               $dbw->endAtomic( __METHOD__ );
                        }
                } catch ( DBError $e ) {
                }